Merge master into feature/flare-mega #7393
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We are bumping the version as it is potentially related to V1793742233 --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. Signed-off-by: nkomonen-amazon <nkomonen@amazon.com>
Did this just to force our codepipeline to retrigger
opieter-aws
approved these changes
May 29, 2025
tomcat323
pushed a commit
to tomcat323/aws-toolkit-vscode
that referenced
this pull request
Jun 5, 2025
## Automatic merge failed - Resolve conflicts and push to this PR branch. - **Do not squash-merge** this PR. Use the "Create a merge commit" option to do a regular merge. ## Command line hint To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo): ``` git stash git fetch --all git checkout origin/feature/flare-mega git merge origin/master git commit git push origin HEAD:refs/heads/autoMerge/feature/flare-mega ``` --------- Signed-off-by: nkomonen-amazon <nkomonen@amazon.com> Co-authored-by: Nikolas Komonen <118216176+nkomonen-amazon@users.noreply.github.com> Co-authored-by: aws-toolkit-automation <> Co-authored-by: opieter-aws <opieter@amazon.com>
tomcat323
pushed a commit
to tomcat323/aws-toolkit-vscode
that referenced
this pull request
Jun 10, 2025
## Automatic merge failed - Resolve conflicts and push to this PR branch. - **Do not squash-merge** this PR. Use the "Create a merge commit" option to do a regular merge. ## Command line hint To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo): ``` git stash git fetch --all git checkout origin/feature/flare-mega git merge origin/master git commit git push origin HEAD:refs/heads/autoMerge/feature/flare-mega ``` --------- Signed-off-by: nkomonen-amazon <nkomonen@amazon.com> Co-authored-by: Nikolas Komonen <118216176+nkomonen-amazon@users.noreply.github.com> Co-authored-by: aws-toolkit-automation <> Co-authored-by: opieter-aws <opieter@amazon.com>
tomcat323
pushed a commit
to tomcat323/aws-toolkit-vscode
that referenced
this pull request
Jun 10, 2025
## Automatic merge failed - Resolve conflicts and push to this PR branch. - **Do not squash-merge** this PR. Use the "Create a merge commit" option to do a regular merge. ## Command line hint To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo): ``` git stash git fetch --all git checkout origin/feature/flare-mega git merge origin/master git commit git push origin HEAD:refs/heads/autoMerge/feature/flare-mega ``` --------- Signed-off-by: nkomonen-amazon <nkomonen@amazon.com> Co-authored-by: Nikolas Komonen <118216176+nkomonen-amazon@users.noreply.github.com> Co-authored-by: aws-toolkit-automation <> Co-authored-by: opieter-aws <opieter@amazon.com>
tomcat323
pushed a commit
to tomcat323/aws-toolkit-vscode
that referenced
this pull request
Jun 10, 2025
## Automatic merge failed - Resolve conflicts and push to this PR branch. - **Do not squash-merge** this PR. Use the "Create a merge commit" option to do a regular merge. ## Command line hint To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo): ``` git stash git fetch --all git checkout origin/feature/flare-mega git merge origin/master git commit git push origin HEAD:refs/heads/autoMerge/feature/flare-mega ``` --------- Signed-off-by: nkomonen-amazon <nkomonen@amazon.com> Co-authored-by: Nikolas Komonen <118216176+nkomonen-amazon@users.noreply.github.com> Co-authored-by: aws-toolkit-automation <> Co-authored-by: opieter-aws <opieter@amazon.com>
tomcat323
pushed a commit
to tomcat323/aws-toolkit-vscode
that referenced
this pull request
Jun 12, 2025
## Automatic merge failed - Resolve conflicts and push to this PR branch. - **Do not squash-merge** this PR. Use the "Create a merge commit" option to do a regular merge. ## Command line hint To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo): ``` git stash git fetch --all git checkout origin/feature/flare-mega git merge origin/master git commit git push origin HEAD:refs/heads/autoMerge/feature/flare-mega ``` --------- Signed-off-by: nkomonen-amazon <nkomonen@amazon.com> Co-authored-by: Nikolas Komonen <118216176+nkomonen-amazon@users.noreply.github.com> Co-authored-by: aws-toolkit-automation <> Co-authored-by: opieter-aws <opieter@amazon.com>
tomcat323
pushed a commit
to tomcat323/aws-toolkit-vscode
that referenced
this pull request
Jun 12, 2025
## Automatic merge failed - Resolve conflicts and push to this PR branch. - **Do not squash-merge** this PR. Use the "Create a merge commit" option to do a regular merge. ## Command line hint To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo): ``` git stash git fetch --all git checkout origin/feature/flare-mega git merge origin/master git commit git push origin HEAD:refs/heads/autoMerge/feature/flare-mega ``` --------- Signed-off-by: nkomonen-amazon <nkomonen@amazon.com> Co-authored-by: Nikolas Komonen <118216176+nkomonen-amazon@users.noreply.github.com> Co-authored-by: aws-toolkit-automation <> Co-authored-by: opieter-aws <opieter@amazon.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Automatic merge failed
Command line hint
To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo):